Skip to content

Merge master into feature/agentic-chat-MCP #7080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 456 commits into
base: feature/agentic-chat-MCP
Choose a base branch
from

Conversation

aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/agentic-chat-MCP
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/agentic-chat-MCP

@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners April 17, 2025 15:56
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner May 1, 2025 03:07
dhasani23 and others added 26 commits May 16, 2025 16:38
## Problem

/transform was unnecessarily prompting users for their target JDK paths
in some cases.

## Solution

Remove the prompt.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
## Problem

In order to coordinate the new
aws/language-servers#1348 change,
GenerateCompletions requests would start expecting the `fileUri` field
to be set.

## Solution

Add `fileUri` to FileContext

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: Jiatong Li <[email protected]>
## Problem
- AgenticChat will add a grepSearch tool which depends on ripgrep binary

## Solution
- Add ripgrep path and make it executable

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem

Our transformation now looks different, so we want the IDE to be able to
handle the new plan response.


## Solution

Implement parsing logic.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
## Problem

Prompting users to select one or multiple diffs is a very infrequently
used feature.


## Solution

Remove it.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>
Team decides to remove .acds and only allow .abap as the file extension of abap language
Sometimes users MAY modify the LSP cache dir for reasons like
development.

We have a feature to clear cache, but right now it does not clear the
LSP cache.
Now we will additionally clear the LSP cache when the user runs the
command `Amazon Q: Clear extension cache`

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>
Duplicate PR of #7357 into
Flare branch

## Problem
When ListRegionProfile call throttles for a subset of regions, we
currently do not throw, but instead return the available profiles in the
regions where the call succeeded. However, if that list is empty (no
profiles in that region), we return an empty list. This breaks the UI,
and causes a state that is not recoverable

## Solution
Throw an error in the scenario where availableProfiles is empty. This
triggers a retry state in the UI, making the state recoverable.


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem:

In ticket V1761315147 it was being reported that createToken could take
9 seconds. This would mean that the SSO client API request would time
out

## Solution:

Bump the timeout to 12 seconds as specified in V1761315147



---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>
## Problem
The workspace LSP has been merged into the Amazon Q LSP (Flare). There
is no need to keep the non-flare workspace LSP, it will consume both CPU
and memory once it starts to index. This will make non agentic chat
experience not having `@file` or `@workspace ` but at this point we want
customers to use agentic chat. As such CPU and memory usage problem is
of higher priority.

## Solution
remove: disable workspace lsp

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem

When users have a /transform tab open, then open a new tab and type
/transform, we open the existing /transform tab but don't show a
notification like IntelliJ does.

## Solution

Add notification in top right.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: David Hasani <[email protected]>
We are bumping the version as it is potentially related to V1793742233


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>
Did this just to force our codepipeline to retrigger
feat(amazonq): add mcp field to client capabilities
## Problem:

    rejected promise not handled within 1 second:
    Error: command 'aws.amazonq.focusChat' not found

## Solution:
Don't use `void` to ignore rejected promises.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
Problem:
The `browser_download_url` in
https://api.github.com/repos/aws/aws-toolkit-vscode/releases/latest
points to a random artifact depending on whether toolkit or amazonq was
the last release to publish.

Solution:
Modify the deploy logic to only set "latest" for "amazonq", never
"toolkit".
## Problem

`chatOptionsUpdate` notifications are not forwarded to UI.

This is needed to persist previously selected model in new tabs.


## Solution

Forward `chatOptionsUpdate` notifications to UI

Related PR: aws/language-server-runtimes#530


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
aws-toolkit-automation and others added 30 commits July 16, 2025 21:33
…logs (#7689)

## Problem

- Removing feature flag for Code Review tool
- Removed change logs for the above too

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
feat(amazonq): write logs to disk with  rotation & cleanup
fix(amazonq): handle suppress single finding, change icon
## Problem

applyDiff may fail and the consequence is the `newCode` to update become
empty string, thus deleting all users' code.


## Before


https://github.com/user-attachments/assets/6524bae2-1374-452d-bb4e-3ec6f865c258






## After




https://github.com/user-attachments/assets/75d5ed7a-6940-4432-a8d9-73c485afb2c3



## Solution


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem
This pr: #7670 didn't been
covered by the unit test

## Solution
Add unit test for the activation initialize method.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
…nput (#7697)

## Problem

The auto trigger classifier needs the entire document change event as
input to correctly predict whether to make auto trigger or not. This
code path was lost when we migrate inline completion to Flare (language
server).

## Solution

Implement the IDE side changes for below PRs:

aws/language-server-runtimes#618

aws/language-servers#1912

https://github.com/aws/language-servers/pull/1914/files


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem

The VS Code provideInlineCompletionCallback may not trigger when Enter
is pressed, especially in Python files


## Solution
manually make this trigger. In case of duplicate, the
provideInlineCompletionCallback is already debounced

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
feat(amazonq): added logs of toolkit to the same disk file too
fix(amazonq): match rotating logger level
… crash restart (#7671)

fix(amazonq): update Q profile and customizations on language-servers crash restart
)

## Problem
This reverts commit 678851b.


## Solution


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
This reverts until 1a5e376.


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: Na Yue <[email protected]>
[chore: removing unwanted
files](bd2d5fe)

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: Na Yue <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.